Fixed conflict while rebasing master.
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Mon, 27 Dec 2010 06:02:01 +0000 (15:02 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 6 Jan 2011 05:39:41 +0000 (14:39 +0900)
commitb8c8f2ccb1a1b69514bf86c02f223b5f8482e457
treefeb44fdf70a51bcedefadece2b6601fe623db182
parent72675f1f28247622cf3a9171305c7a4cff899719
Fixed conflict while rebasing master.
gtk/gtkwindow.c